8fed0391582406b02382ea52dd601df105261466,portal-impl/src/com/liferay/portlet/asset/service/persistence/AssetEntryFinderImpl.java,AssetEntryFinderImpl,buildAssetQuerySQL,#AssetEntryQuery#boolean#Session#,152

Before Change



		sb.append("[$DATES$]");

		long[] groupIds = entryQuery.getGroupIds();

		sb.append(getGroupIds(groupIds));

		long[] classNameIds = entryQuery.getClassNameIds();

		sb.append(getClassNameIds(classNameIds));

		if (!count) {
			sb.append(" ORDER BY AssetEntry.");
			sb.append(entryQuery.getOrderByCol1());
			sb.append(StringPool.SPACE);
			sb.append(entryQuery.getOrderByType1());

			if (Validator.isNotNull(entryQuery.getOrderByCol2()) &&
				!entryQuery.getOrderByCol1().equals(
					entryQuery.getOrderByCol2())) {

				sb.append(", AssetEntry.");
				sb.append(entryQuery.getOrderByCol2());
				sb.append(StringPool.SPACE);
				sb.append(entryQuery.getOrderByType2());
			}
		}

		String sql = sb.toString();

		sql = getDates(
			sql, entryQuery.getPublishDate(), entryQuery.getExpirationDate());

		SQLQuery q = session.createSQLQuery(sql);

		if (count) {
			q.addScalar(COUNT_COLUMN_NAME, Type.LONG);
		}
		else {
			q.addEntity("AssetEntry", AssetEntryImpl.class);
		}

		QueryPos qPos = QueryPos.getInstance(q);

		if (entryQuery.isVisible() != null) {
			qPos.add(entryQuery.isVisible().booleanValue());
		}

		qPos.add(entryQuery.getAllCategoryIds());
		qPos.add(entryQuery.getAnyCategoryIds());
		qPos.add(entryQuery.getNotAllCategoryIds());
		qPos.add(entryQuery.getNotAnyCategoryIds());

		qPos.add(entryQuery.getAllTagIds());
		qPos.add(entryQuery.getAnyTagIds());
		qPos.add(entryQuery.getNotAllTagIds());
		qPos.add(entryQuery.getNotAnyTagIds());

		setDates(
			qPos, entryQuery.getPublishDate(),
			entryQuery.getExpirationDate());

		for (long groupId : groupIds) {
			qPos.add(groupId);
		}

After Change



		sb.append("[$DATES$]");

		sb.append(getGroupIds(entryQuery.getGroupIds()));

		sb.append(getClassNameIds(entryQuery.getClassNameIds()));